Mark Hammond reports that Cygwin termio handling is broken on the second

open.  Revert to the WIN32 API for that case.

diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.c
index 6a8709a954933b4fc79b7db6d3e3d647f963f2a4..fbbfbcbad5ddeece5d542f227038b35ef186f904 100644 (file)
--- a/gpsbabel/jeeps/gpsserial.c
+++ b/gpsbabel/jeeps/gpsserial.c
@@ -31,8 +31,10 @@
 #include <unistd.h>
 #include <time.h>
 
-
-#if __WIN32__
+/* 
+ * termio on Cygwin is apparently broken, so we revert to Windows serial.
+ */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 
 #include <windows.h>
 /*

diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index e8d040ba664189e71c1be6fb8c676677817bfdca..b6d4288c87ee9595114596c9c822db615452974a 100644 (file)
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -472,7 +472,10 @@ retry:
                mag_writeack(isum);
 }
 
-#if __WIN32__
+/* 
+ * termio on Cygwin is apparently broken, so we revert to Windows serial.
+ */
+#if defined (__WIN32__) || defined (__CYGWIN__)
 
 #include <windows.h>